Open
Conversation
5c2518a to
b32e346
Compare
Author
|
@techtonik, this is ready for your consideration now. I hope to add it soon to https://github.com/conda/conda-build as our patching mechanism because currently we use either the system's |
mingwandroid
added a commit
to mingwandroid/conda-build
that referenced
this pull request
Jun 7, 2016
b32e346 to
d5b90be
Compare
mingwandroid
added a commit
to mingwandroid/conda-build
that referenced
this pull request
Jun 7, 2016
`patch.exe` from gnuwin32 has fallen over on several of my bigger patches now and it's becoming a serious impediment. I don't want to add MSYS2's `patch.exe` since that requires a lot of infrastructure to work correctly (though I could build a native Windows `patch.exe` if necessary). However rather than relying on some arbitrary `patch` executable, it's better to use Python to do the work and avoid the subprocess overhead (though there will be a native-vs-python difference). Also add automatic patch skip level detection logic, which allows us to directly use patches generated using `git format-patch` and also those authored by external entities without needing to add metadata (although this may not be a bad idea). This part could be moved into patch.py at a later point perhaps? I've not added tests for this since upstream has a comprehensive testsuite (and I did add tests to check my changes to my PR). Upstream: https://github.com/techtonik/python-patch Pull Req: techtonik/python-patch#41
mingwandroid
added a commit
to mingwandroid/conda-build
that referenced
this pull request
Jun 7, 2016
`patch.exe` from gnuwin32 has fallen over on several of my bigger patches now and it's becoming a serious impediment. I don't want to add MSYS2's `patch.exe` since that requires a lot of infrastructure to work correctly (though I could build a native Windows `patch.exe` if necessary). However rather than relying on some arbitrary `patch` executable, it's better to use Python to do the work and avoid the subprocess overhead (though there will be a native-vs-python difference). Also add automatic patch skip level detection logic, which allows us to directly use patches generated using `git format-patch` and also those authored by external entities without needing to add metadata (although this may not be a bad idea). This part could be moved into patch.py at a later point perhaps? I've not added tests for this since upstream has a comprehensive testsuite (and I did add tests to check my changes to my PR). Upstream: https://github.com/techtonik/python-patch Pull Req: techtonik/python-patch#41
mingwandroid
added a commit
to mingwandroid/conda-build
that referenced
this pull request
Jun 7, 2016
`patch.exe` from gnuwin32 has fallen over on several of my bigger patches now and it's becoming a serious impediment. I don't want to add MSYS2's `patch.exe` since that requires a lot of infrastructure to work correctly (though I could build a native Windows `patch.exe` if necessary). However rather than relying on some arbitrary `patch` executable, it's better to use Python to do the work and avoid the subprocess overhead (though there will be a native-vs-python difference). Also add automatic patch skip level detection logic, which allows us to directly use patches generated using `git format-patch` and also those authored by external entities without needing to add metadata (although this may not be a bad idea). This part could be moved into patch.py at a later point perhaps? I've not added tests for this since upstream has a comprehensive testsuite (and I did add tests to check my changes to my PR). `patch.py` is also excluded from flake8 for now. Upstream: https://github.com/techtonik/python-patch Pull Req: techtonik/python-patch#41
Author
|
@techtonik can you please review this? |
|
Hi @techtonik ! Could you please review this PR? This fix is important. |
This was referenced Sep 27, 2019
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Let's see how this one performs.